Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hwmv2 revert common board ci #6

Closed
wants to merge 15 commits into from
Closed

Conversation

nordicjm
Copy link
Owner

No description provided.

nordicjm added 15 commits March 27, 2024 16:17
This change reverts a change that was introduced with hwmv2 which
allowed for using common board names for overlays, given the board
target ``nrf9160dk@0.7.0/nrf9160/ns``.

In hwmv1 this would have used:
    ``nrf9160dk_nrf9160_ns.conf``.
    ``nrf9160dk_nrf9160_ns_0_7_0.conf``.

In hwmv2 this would have used:
    ``nrf9160dk_nrf9160_ns.conf``
    ``nrf9160dk_nrf9160_ns_0_7_0.conf``
    ``nrf9160dk_nrf9160.conf``
    ``nrf9160dk_nrf9160_0_7_0.conf``
    ``nrf9160dk.conf``
    ``nrf9160dk_0_7_0.conf``

With these changes, the following are used (which restores the hwmv1
behaviour):
    ``nrf9160dk_nrf9160_ns.conf``
    ``nrf9160dk_nrf9160_ns_0_7_0.conf``

For a board with a default SoC which is not a variant for example
``rpi_pico`` then ``rpi_pico.conf`` will also be used, this file
will not be used for variants e.g. ``rpi_pico/rp2040/w``

This revert is needed to avoid issues whereby variants have
incompatible configuration to the parent board target, which has
been affecting samples and tests.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This reverts commit 037a3b5.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This reverts commit 7277cae.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This reverts commit c47c37d.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Splits configuration up that was merged as part of hwmv2 due to
the merged configuration feature being reverted

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Adds the SoC name to twister board identifiers and renames all
Kconfig fragment and overlay files to have the SoC name in

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Renames boards to use identifiers which have the SoC name in

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Updates board names to have the SoC in them

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Updates readme files to include SoC names

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Renames boards to use identifiers which have the SoC name in

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Renames boards to use identifiers which have the SoC name in

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Renames board files to use identifiers which have the SoC name in

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Updates MCUboot board names to account for hwmv2 changes

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Deprecated .dts, .overlay and .conf files that have the name of the
board itself but without the name of the SoC in them, emits cmake
deprecation notices upon such files being found.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Removes information on common includes as this feature has been
removed

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm nordicjm force-pushed the hwmv2-revert-common-board-ci branch from 2375001 to 851965b Compare March 27, 2024 16:17
@nordicjm nordicjm closed this Mar 28, 2024
nordicjm pushed a commit that referenced this pull request Oct 28, 2024
hci_packet_complete(buf, buf_size) should check whether buf_size is
enough.
For instance, hci_packet_complete can receive buf with buf_size 1,
leading to the buffer overflow in cmd->param_len, which is buf[3].
This can happen when rx_thread() receives two frames in 512 bytes
and the first frame size is 511. Then, rx_thread() will call
hci_packet_complete() with 1.

==5==ERROR: AddressSanitizer: global-buffer-overflow on address
0x000000ad81c2 at pc 0x0000005279b3 bp 0x7fffe74f5b70 sp 0x7fffe74f5b68

READ of size 2 at 0x000000ad81c2 thread T6
    #0 0x5279b2  (/root/zephyr.exe+0x5279b2)
    #1 0x4d697d  (/root/zephyr.exe+0x4d697d)
    #2 0x7ffff60e5daa  (/lib/x86_64-linux-gnu/libc.so.6+0x89daa)
(BuildId: 2e01923fea4ad9f7fa50fe24e0f3385a45a6cd1c)

0x000000ad81c2 is located 2 bytes to the right of global variable
'rx_thread.frame' defined in 'zephyr/drivers/bluetooth/hci/userchan.c'
(0xad7fc0) of size 512
SUMMARY: AddressSanitizer: global-buffer-overflow
(/root/zephyr.exe+0x5279b2)
Thread T6 created by T2 here:
    #0 0x48c17c  (/root/zephyr.exe+0x48c17c)
    #1 0x530192  (/root/zephyr.exe+0x530192)
    #2 0x4dcc22  (/root/zephyr.exe+0x4dcc22)

Thread T2 created by T1 here:
    #0 0x48c17c  (/root/zephyr.exe+0x48c17c)
    #1 0x530192  (/root/zephyr.exe+0x530192)
    #2 0x4dcc22  (/root/zephyr.exe+0x4dcc22)

Thread T1 created by T0 here:
    #0 0x48c17c  (/root/zephyr.exe+0x48c17c)
    #1 0x52f36c  (/root/zephyr.exe+0x52f36c)
    #2 0x5371dc  (/root/zephyr.exe+0x5371dc)
    #3 0x5312a6  (/root/zephyr.exe+0x5312a6)
    #4 0x52ed7b  (/root/zephyr.exe+0x52ed7b)
    #5 0x52eddd  (/root/zephyr.exe+0x52eddd)
    #6 0x7ffff6083c89  (/lib/x86_64-linux-gnu/libc.so.6+0x27c89)
(BuildId: 2e01923fea4ad9f7fa50fe24e0f3385a45a6cd1c)

==5==ABORTING

Signed-off-by: Sungwoo Kim <iam@sung-woo.kim>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant